Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Orbit Poll respects Preferences + Asks for Permission to Unghost #632

Merged
merged 1 commit into from
Nov 15, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25014
Original PR: tgstation/tgstation#79712

About The Pull Request

Fixes #79676

Ticking either the player or admin "do not consider me for ghost roles" excludes you from the pool of candidates in an orbit ghost poll.

You will now get a tgui_alert() asking you if you want to accept being put into the orbit poll role's before you accept it, putting it in line with every other ghost role in the game. If the player doesn't accept, the proc is re-ran with someone else on the list.

Why It's Good For The Game

We need both of these behaviors present to keep it standard with what players expect with ghost roles, and it is annoying to be an admin/AFK player who gets hotswapped into one of these roles while they're doing stuff.

Changelog

🆑 san7890
qol: You will no longer be added to the list for ghost-orbit role polls if you have opted out of getting antag ghost roles in your preferences.
qol: You will get a tgui_alert to accept the ghost role if you were selected via the orbit poll, instead of it just throwing you intot he role.
/:cl:

…host [MDB IGNORE] (#25014)

* Orbit Poll respects Preferences + Asks for Permission to Unghost (#79712)

## About The Pull Request

Fixes #79676

Ticking either the player or admin "do not consider me for ghost roles"
excludes you from the pool of candidates in an orbit ghost poll.

You will now get a `tgui_alert()` asking you if you want to accept being
put into the orbit poll role's before you accept it, putting it in line
with every other ghost role in the game. If the player doesn't accept,
the proc is re-ran with someone else on the list.
## Why It's Good For The Game

We need both of these behaviors present to keep it standard with what
players expect with ghost roles, and it is annoying to be an admin/AFK
player who gets hotswapped into one of these roles while they're doing
stuff.
## Changelog
:cl:
qol: You will no longer be added to the list for ghost-orbit role polls
if you have opted out of getting antag ghost roles in your preferences.
qol: You will get a tgui_alert to accept the ghost role if you were
selected via the orbit poll, instead of it just throwing you intot he
role.
/:cl:

* Orbit Poll respects Preferences + Asks for Permission to Unghost

---------

Co-authored-by: san7890 <[email protected]>
@Iajret Iajret merged commit 577b6b9 into master Nov 15, 2023
24 checks passed
@Iajret Iajret deleted the upstream-mirror-25014 branch November 15, 2023 09:22
AnywayFarus added a commit that referenced this pull request Nov 15, 2023
Iajret pushed a commit that referenced this pull request Jan 26, 2024
* Fixes reagent transfer logging on organs (#81078)

## About The Pull Request

Fixes combat log for reagent transfer into organs, closes
tgstation/tgstation#80907

## Changelog
Not player-facing.

---------

Co-authored-by: LemonInTheDark <[email protected]>

* Fixes reagent transfer logging on organs

---------

Co-authored-by: lessthanthree <[email protected]>
Co-authored-by: LemonInTheDark <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants